Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build: bump to Go 1.21 (backport #17333) #17442

Merged
merged 4 commits into from
Aug 18, 2023
Merged

build: bump to Go 1.21 (backport #17333) #17442

merged 4 commits into from
Aug 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 18, 2023

This is an automatic backport of pull request #17333 done by Mergify.
Cherry-pick of f0030e0 has failed:

On branch mergify/bp/release/v0.50.x/pr-17333
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit f0030e0e6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .github/workflows/build.yml
	modified:   .github/workflows/codeql-analysis.yml
	modified:   .github/workflows/dependabot-update-all.yml
	modified:   .github/workflows/dependencies-review.yml
	modified:   .github/workflows/lint.yml
	modified:   .github/workflows/release-confix.yml
	modified:   .github/workflows/release-cosmovisor.yml
	modified:   .github/workflows/release.yml
	modified:   .github/workflows/sims-045.yml
	modified:   .github/workflows/sims-046.yml
	modified:   .github/workflows/sims-047.yml
	modified:   .github/workflows/sims-nightly.yml
	modified:   .github/workflows/sims.yml
	modified:   .github/workflows/test.yml
	modified:   Dockerfile
	modified:   README.md
	modified:   collections/go.mod
	modified:   contrib/images/simd-dlv/Dockerfile
	modified:   contrib/images/simd-env/Dockerfile
	modified:   go.mod
	modified:   go.sum
	modified:   go.work.example
	modified:   simapp/go.mod
	modified:   simapp/go.sum
	modified:   tests/go.mod
	modified:   tests/go.sum
	modified:   tools/confix/go.mod
	modified:   tools/confix/go.sum
	modified:   tools/cosmovisor/go.mod
	modified:   tools/cosmovisor/go.sum
	modified:   tools/hubl/go.mod
	modified:   tools/hubl/go.sum
	modified:   x/circuit/go.mod
	modified:   x/circuit/go.sum
	modified:   x/evidence/go.mod
	modified:   x/evidence/go.sum
	modified:   x/feegrant/go.mod
	modified:   x/feegrant/go.sum
	modified:   x/nft/go.mod
	modified:   x/nft/go.sum
	modified:   x/tx/go.mod
	modified:   x/tx/go.sum
	modified:   x/upgrade/go.mod
	modified:   x/upgrade/go.sum

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/sims-050.yml
	deleted by us:   .github/workflows/starship-tests.yml
	both modified:   collections/go.sum
	both modified:   contrib/devtools/Dockerfile
	deleted by us:   flake.nix
	deleted by us:   tests/starship/tests/go.mod
	deleted by us:   tests/starship/tests/go.sum

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@julienrbrt @mergify
build: bump to Go 1.21 (#17333)
ec525f3 
(cherry picked from commit f0030e0)

# Conflicts:
#	.github/workflows/sims-050.yml
#	.github/workflows/starship-tests.yml
#	collections/go.sum
#	contrib/devtools/Dockerfile
#	flake.nix
#	tests/starship/tests/go.mod
#	tests/starship/tests/go.sum
@mergify mergify bot requested a review from a team as a code owner August 18, 2023 10:02
@mergify mergify bot added the conflicts label Aug 18, 2023
@julienrbrt julienrbrt self-assigned this Aug 18, 2023
@julienrbrt julienrbrt marked this pull request as draft August 18, 2023 10:47
@julienrbrt julienrbrt marked this pull request as ready for review August 18, 2023 11:28
@julienrbrt julienrbrt enabled auto-merge (squash) August 18, 2023 11:30
@julienrbrt julienrbrt merged commit c402c51 into release/v0.50.x Aug 18, 2023
43 of 45 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-17333 branch August 18, 2023 11:54
@faddat faddat mentioned this pull request Nov 8, 2024
Closed
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@julienrbrt julienrbrt julienrbrt approved these changes

@kocubinski kocubinski Awaiting requested review from kocubinski

Assignees

@julienrbrt julienrbrt

Labels
C:collections C:Confix Issues and PR related to Confix C:Cosmovisor Issues and PR related to Cosmovisor C:Hubl Tool: Hubl C:x/circuit C:x/evidence C:x/feegrant C:x/nft C:x/tx C:x/upgrade conflicts Type: Build Type: CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@julienrbrt